Skip to content

Fix initial commit page & binary munching problem (#13249)#13259

Merged
zeripath merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-13249-1.12
Oct 22, 2020
Merged

Fix initial commit page & binary munching problem (#13249)#13259
zeripath merged 1 commit into
go-gitea:release/v1.12from
zeripath:backport-13249-1.12

Conversation

@zeripath
Copy link
Copy Markdown
Contributor

Backport #13249

  • Fix initial commit page

Unfortunately as a result of properly fixing ParsePatch the hack that
used git show <initial_commit_id> to get the diff for this failed.

This PR fixes this using the "super-secret" empty tree ref to make the
diff against.

Signed-off-by: Andrew Thornton art27@cantab.net

Signed-off-by: Andrew Thornton art27@cantab.net

  • Update services/gitdiff/gitdiff.go

Co-authored-by: 6543 6543@obermui.de

Backport go-gitea#13249

* Fix initial commit page

Unfortunately as a result of properly fixing ParsePatch the hack that
used git show <initial_commit_id> to get the diff for this failed.

This PR fixes this using the "super-secret" empty tree ref to make the
diff against.

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Also fix go-gitea#13248

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update services/gitdiff/gitdiff.go

Co-authored-by: 6543 <6543@obermui.de>
@zeripath zeripath added this to the 1.12.6 milestone Oct 22, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Oct 22, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 22, 2020
@6543
Copy link
Copy Markdown
Member

6543 commented Oct 22, 2020

🚀

@zeripath zeripath merged commit f1fd8a7 into go-gitea:release/v1.12 Oct 22, 2020
@zeripath zeripath deleted the backport-13249-1.12 branch October 22, 2020 14:30
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants